//TODO test mapPoints and such